Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vte: enable compiling with musl #71577

Merged
merged 1 commit into from
Oct 28, 2019
Merged

vte: enable compiling with musl #71577

merged 1 commit into from
Oct 28, 2019

Conversation

cdepillabout
Copy link
Member

@cdepillabout cdepillabout commented Oct 21, 2019 •
edited
Loading

This enables VTE to be compiled with pkgsMusl.

VTE requires a small patch to be compiled with musl.

This has been upstreamed, but there appears to be some resistance to support enabling builds with musl:
https://gitlab.gnome.org/GNOME/vte/issues/72

Motivation for this change

This is for nh2/static-haskell-nix#50. I'd like to get VTE compiling with musl, and eventually compiling statically.

You can test this like the following:

$ nix-build -A pkgsMusl.vte
...
/nix/store/4bbyrrnbildrs9807jcwpl544m0jc26h-vte-0.58.2
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @nh2 @domenkozar @matthewbauer @astsmtl @antono @lethalman

@cdepillabout
Copy link
Member Author

Note that there are currently 4 commits in this PR, but three of them are just from #71575: b1b809f, 4845af0, and 317cd4d.

This PR should only be merged after #71575, and should be rebased on master after #71575 is merged.

This was referenced Oct 21, 2019
Merged
Merged
Merged
@cdepillabout
Copy link
Member Author

This is related to the following three PRs:

@cdepillabout
Copy link
Member Author

@GrahamcOfBorg build vte

@GrahamcOfBorg build pkgsMusl.vte

@ofborg ofborg bot requested review from matthewbauer and astsmtl October 21, 2019 20:27
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000 labels Oct 21, 2019
@cdepillabout
Copy link
Member Author

cdepillabout commented Oct 22, 2019 •
edited
Loading

Before merging in, this PR should be changed so that vte takes enableSystemd as an argument as recommended by @nh2 in #71575 (comment).

@FRidh FRidh added the 2.status: work-in-progress This PR isn't done label Oct 24, 2019
@nh2
Copy link
Contributor

nh2 commented Oct 26, 2019

Before merging in, this PR should be changed so that vte takes enableSystemd as an argument as recommended by @nh2 in #71575 (comment).

For this one it isn't necessary, because vte itself needs a musl-specific patch and doesn't depend on systemd.

@cdepillabout
Copy link
Member Author

@nh2 Good catch.

This PR just depends on these other three PRs, which need to be merged in before this can be rebased on master and merged in:

#71577 (comment)

@cdepillabout @nh2
vte: enable building with musl
fc265d9 
VTE requires a small patch to be able to be built with musl.
@nh2 nh2 force-pushed the vte-compiling-with-musl branch from 8d8a69b to fc265d9 Compare October 28, 2019 15:12
@nh2
Copy link
Contributor

nh2 commented Oct 28, 2019

Rebased on master

@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 6.topic: printing 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000 labels Oct 28, 2019
@cdepillabout
Copy link
Member Author

Note that this PR still needs #71575 merged into master before it makes sense to merge this PR in.

@nh2
Copy link
Contributor

nh2 commented Oct 28, 2019

Note that this PR still needs #71575 merged into master before it makes sense to merge this PR in.

Merged that one.

This one has worked fine for me in static-haskell-nix so far, and no changes for non-musl; merging this one too.

@nh2 nh2 merged commit aaddb5f into NixOS:master Oct 28, 2019
@cdepillabout cdepillabout deleted the vte-compiling-with-musl branch October 28, 2019 19:42
@nh2 nh2 mentioned this pull request Nov 3, 2019
Open
60 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nh2 nh2 nh2 approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@astsmtl astsmtl Awaiting requested review from astsmtl

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@hedning hedning Awaiting requested review from hedning

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
2.status: work-in-progress This PR isn't done 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cdepillabout @nh2 @FRidh